Fix issue with tag, missing join