Added filter grouping and null deadline option in opportunity filter