Changes to the user queries and improvements