[TASK] Resolve empty table row issue