Fix user query