Any chance to merge the two list iterations into one e.g. by using a bool that tells you whether to call UpdateProperties() or not? Looks like UpdateVisibility() needs to be called either way.