Fixed up vistas to always require a Collector id