Don't Show Users That Opted Out [MJ-641]

Added filter to exclude users that have opted out. + small revision on filters to reduce queries.

All Tests Pass