improved enter button processing
Fixing select user
search button missed in commit
removed unused