With user query added