bug fix to handle 'aaa+bbb' queries