refactored parts of getFeatureInfo

JSON and CSV appear to be working, will debug from here, lets get this up against the web portal