Preserve default ordering when using filtering

Closes #1432.

As requested for the original closed PR #1481 and as detailed in the original issue #1432