Refresh an entries generation automatically on probe. Minor simplification as well.