Fixed unit selection, now gets the associated unit key (days,weeks,...) instead of checking the first letter of the matched unit subelement. Also move unit check before date check, some languages like FR got month names contained in week names i.e 'mai' (May) is contained in 'semaine' ('week'). Moving the check appeared to be faster than updating all regular expressions.