Updated user model and search controller
Resolved conflict in profile#edit view