fixed empty id issue