Improve safe-html, works on Safari
Make safe-html more generic
Combine event start date and time