Updated to work with DynamicFilters
Merge branch 'master' of https://github.com/jtstriker3/Joe.MapBack