Fix visibility choice not honored; fill in generator metadata from generator service