NXP-13424: Fix sorting issue with space