Allow searching by username
removing un-needed join and updating to include the totals calculation for the collection
Merge branch 'akrabat-user-search'