FeatureInfo content-type switch is now more robust