Added fallback to actual field values as options