Fixed markers (temporary) and fixed bugs in POI and marker clicking