Even more shutdown cleanup fixing
Return all columns for full table rows data