fix to keyword searching