fixed issue where keys were being added to data points when non existed