Simplify keyword query to rely on their existing parts