Fixing import issue - tenant IDs can be strings

Fixes #455