Fixed Else model and row updating