added new TableHasRows condition
changed DefaultTable to Table