Fixing base tag breaking relations, ready to deploy (hopefully)