Added functionality for searching by user