Added username lookup to search