Calendar sort is now working