Updated Filter Options

Should be complete, needs testing