Added aggregate queries for boundaries