DefaultMetadataService: add temp hack workaround