Default boost-templates properly

The message configured boost templates was only taking effect on prefix
searches.

Change-Id: I92366a752f099834637ed6119a66e7ebe06e7cd9
Merge "Default boost-templates properly"