Fix sorting for Last Survey date
Merge branch 'MH-534' into dev