fix bug in filtering when using uris
Merge branch 'master' of github.com:descl/ZONE
Merge branch 'master' of github.com:descl/ZONE