Fixes and removed uri_filter duplicate