Merge "Extract tags before pass them in create/update"