Fix to use $input_id to repopulate data