Refactor expense route + support null dates