finalizing the street segments query rule
Merge branch 'streetsegments' into dev