adding filter check and option check