Fixed an error with TPI. Fixed an issue with the default policy when using a different tag than default