Improved GetFeatureInfo heuristics