Fixed issue where fields containing dashes were not being picked up by the analyser