Fix issue with HBase annotation indexing