Replacing Model enrichers with dropdown queries