Fix boundary import + Optimize query to split way with boundaries