fixes for keyword searching