Fixed a issue with the popups not displaying the correct inforamtion.