added multi-word indexes
fixes for multi-word indexes