Added fix for start_time and end_time JS error