Bug in tool generator fixed

New queries added