Fixed bug: Not clearing tableAndSchemaName caused unexpected queries to be included when it is not supposed to be