big fix/cleanup to VPC mapper using tags instead of ugly broken workthrough