Removing code lookup, add tag comment