area-related names changed to content-related names. index::within parameters sequence corrected to match the geometry::within parameters sequence.