Fix problem with back to list button going to the wrong list