Improve sequence of metadata listing URIs, minor tidying.
Fix mistake in PropertyManager class.