Fixing issue with mixed up alarm dp sorting