Fix message routing for normal and high priority