REFACTOR removed hard coded id
BUGFIX date ordering was incorrec