Modify search results headers

Branch of #101 
Fixes #102