Fixed setup_provider to honour tags
Merge pull request #754 from psav/fix_setup_provider

Fixed setup_provider to honour tags