Added "Filter" suffix to some of the options properties and removed || null bits.