cleanup after implementing rhs filtering

Issue present where first filtering doesn’t show anything, but
following filtering does work