Issue #20866: Fixed issues with drawers, added kind type to table,