Fixed setup_provider to honour tags

Fixed setup_provider to honour tags