Username query added to routes better