added username in query