Refactoring search and query ui.
Merge branch 'master' of https://github.com/wandora-team/wandora
Refactoring search and query ui, part II.