Fix a bug where wrong entries were getting displayed "open later" panel. + more popup preparations and code improvement