Fix for dynamic state list population on edit order