fixed issues with maps and markers