Fix onListClick issues