Add support for User Search + fix some bugs