Fixed slick optionset determination for sites with field_layout vs. layout_builder enabled.