Fixed invalid annotations
Added custom formats to the date sorting method.