add __id__ to queries
add __id__ to vtm queries