Filter Option

add some conditions to hopefully make each statement separate and
complete