Improve search results output. Fixes some markup issues

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'improve-search-output' into 'master'

Improve search output

See merge request !1046