started optimizing querybuilding for MapEntries