made changes to query to get by username