Now handles variables with a '-' in front of the field name gracefully'