fixed -> instead of =>
Merge branch 'search-templating' into bt