refactoring and bug fixes related to removal of multiple values entries