complete ows_url migration
add better filtering options
Merge branch 'master' into integration