[OE-3847] Fixing the select dropdowns