Merge remote-tracking branch 'origin/develop'

* origin/develop:
  Correct URL creation for search result.
  escapes special chars in search box (not in extended search) because search_autocomplete finds results thats not showing up in the search result.
  case 2318 - Search routine required keys.
Release: v1.9.6
Merge branch 'master' into develop

* master:
  Release: v1.9.6