Fix bug with date sorting
Generalize keywordize function so all maps are using keywords