Added ability to search by user