+

a) use default dropdown count
b) SAL_N_ELEMENTS

Change-Id: I67f12137eedb19bcaf79309fc64bf5c29a70e64d