query and vocab fixes