Previous implementation worked only for point point line selection, this works for any combination.