CDB-2891 Started to fix table retrieval too