Related fields now take the right options