Refactored and fixed text search for admin/user