Added in fix for indexes.  Now, all types should properly leverage multi-type indexing & replacement of CONTAINS for EQUALS in searching the index.