This adds an additional layer parameter and slightly changes the queries to do more efficient lookups for large area features.