Added username to query