I recommend not using incident_state at all.  It's a legacy field and no longer necessary, you should just use state for all of your task extended tables.

(the business rule keeps them in sync for the customers that are still using incident state)