Remove debugging code
Fix adding of terms in multiword search
Fix removal of terms in multiword search