us40418: dropdown changed - removing of listeners changed, variables renamed
adding logic