Modify search results headers

Branch off #101 
Fixes #102