add missing filters: location, types
simple reorder of params