Dcikatic/sol 20 filter changes

Also, see comments in https://github.com/edx/edx-platform/pull/6023 and https://github.com/edx/edx-platform/pull/6084