Fix repeatable button fields