Fix the issues with the search for keywords, maybe related to the simple form.