Issue 171. Improve the GetFeatureInfo plugin