CORE-5031: Fixed the listing queries to exclude linkPoints.