Fixed problems where we were doing global lookups (DANGER!) instead of local to the view
Fixed problems where we were doing global lookups (DANGER!) instead of local to the view

tijmenb/spotlight,alphagov/spotlight,tijmenb/spotlight,tijmenb/spotlight,alphagov/spotlight,keithiopia/spotlight,alphagov/spotlight,keithiopia/spotlight,keithiopia/spotlight