fixes for saving user states in eav