HIPVM-615 avoiding uncessary rescans