[DF-4297] - correct positioning + validation.