Fix removal of part-of-speech from multiword term
Update query after adding part-of-speech
Update query after adding or removing a term