Add 'AND' / 'OR' operators to query.
Merge branch 'development' of https://github.com/kata-csc/ckanext-kata into haun_parannus_vaihe2
Order search extra parameters before parsing to query.