Fix attributes populating popup