poi
popup close correction
Merge branch 'changesInPopup'