Fix edit common attributes scenario