Update for extracting tag/key values.