Added proper template support, and suggestions to Search Core