Fix set appending logic and switch key name