complex forms working correctly on add and remove