Issue #223 query logic
Issue #223 search views
Issue #223 controller logic
Issue #223 fix indentation