Fix of routes, added date helper