added support for map filtering and grouping