Datalist bug fix

Fixed 'trapped' when back in cell - bugs were in switch-case