Added filter for Yes/No