Small fixes [ci skip]
Fixed grammar id building
Added join part