ESSENTIALS-198: add single selection fields.