Added support for rect, poly, segment on resource URI query parameters.