Added contextual_range_filter patch