CBIDXT-310: indexer bug fixes for Count().

Change-Id: I1f7918ca6a9b48098fa2b60544b2d0757dff70ae