Fixed detection of keywords to ensure we can also pick up customers searching for empty strings