Updated Filter Options

Working needs comparing to previous version