Added support for implicit secondary index '$bucket'