Fix sorting bug
Deploy from production branch (until Monday)