QueryTree..add(): add addtional test, fix bug, refactor code, pass