Decoder analyser did not work. This corrects the problem, removes unused
entries and corrects the orders of strings vs enum list.