Fix option tags in fields