This should improve performance a little for large libraries, at the expense of loading when a property is selected