make the feature work
Merge branch 'feature/search-on-url-change' into develop

* feature/search-on-url-change:
  make the feature work