Cleaned up Search > Templating