Fix indexer bugs

Also prevent matching feature names that are standalone common words

Auditors: blackmad