CLSN-2106 : consider location/bucket while tagging