Query refactoring, backend implementation of set search form,
integration with frontend
Merge with master
Merge pull request #62 from ucam-cl-dtg/set-search

Set search