Change user query API to use Query Parameters