Fixed option filtering.