Fix issues of dropping and variable label name
Defect: VIS-37
Authored by: namhm 2013-10-26
Parent: [r77]
Child: [r79]
