GIS: Fix issue with no_popups