Merge branch '731-better-result-page-if-no-result-is-found-on-a-site-serch' into 'development'

Resolve "better result page if no result is found on a site serch"

Closes #731

See merge request !1296