some fix with date sorting #43