Fix user query issue;