[FIX] Fixed notification order and added field updating feature