Issue #25035:add prj_number to list and other list cleanup