Added filter for options data