few more regex simplifications to date-detector templates