Added query to context to show after search. Commented, not in use.
Merge branch 'development' into haun_parannus_vaihe2