Slightly improved our matching of 	metadata ids.