change selector api to refer to geometry rather than rectangle