Fix for repeatable fields removal and saving