Revert "Revert "Updated to generate only consolidated points""

This reverts commit 80aff7bdefdbbaecdecafd43bd337f80691d6b59.
Revert "Revert "Hard match on instance instead of startswith""

This reverts commit 95804016d43da613ca4a928bc41072e9b5c06598.