[WIP] PIM-1420 Improve completeness calculation