Performance improvements on uncremental scanning