do not use optional for add_node

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>
do not use optional for add_node

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>
throw exception if query is derived

Signed-off-by: Andrey Rybalchenko <rybal@microsoft.com>