better support for bucket tags