Bug fix for multiple keyword searches