Added users search
Merged