CDB-2891 More qualifiactions and proper table loads