Fix show all logic