Fixed and refactored resolving empty value id logic for attribute value
file from workbench.