removed collocquery test code and optimizations for indexing