Add bug fix for empty id in form view