Remove stray template-tags
Fix multiple events on same day code