Fixed map index with enum keys on Predicate queries

This time it fixes all occurences of the enum index bug :-)