Minor fixes for search
Api: Static query filter to dynamic query filters