Working on a fix for the status dropdown sometimes showing the previous state after a change