Fix the predefined queries