[TASK] ADWD-1402 empty option of select boxes removed