refactor filter on wms request to work also with graphics