add categories to search templates
Merge branch 'master' into debian
update changelog