fixes for remove button displaying multiple times in repeatable field