Fixed issue with no data displaying on popup