Tweaks in search templates. #149
Merge pull request #153 from rafalp/master

Syncing dev with master