Added support for webmaps containing their own filter
Merge branch 'add_webmap_filter_support' into develop