refactoring
fix vbac
vbac: add internal impl of incQuery option