Improve notification ordering