Changed building of fixtures to key off tag rather than instance ID