Added mustache template for map - fixed some join issues