Minor refactoring
Compile marker popups on open