Changed javascript_id to figure_id