Refactor search models and views.