Refactor search models and views.
Merge pull request #22 from aleph2012/refactor-search-views-and-models

Refactor search models and views.