improve sjoin parsing