template and date search fixes