Update search query override

This works much better now