Update and improve logic for Issues list