fixes to keyword search query