Better getFeatureInfo handling