sekhar- added search by user functionality
sekhar- conflicts resolved in views