Completion: fix existing attributes with values