adopt new search result markup needed for remote search
merge branch 'master' into adaptors
merge branch 'master' into adaptors
fix concat of engine paths
merge branch 'master' into adaptors
merge branch 'adaptors'