Fixed setup_provider to honour tags