Fixed alarms per order by alarm bug