Revert "Make unwieldy venue piece filter last"

This reverts commit 0e4cfe90ba2282b7c7ed551f8a78448506c5d951.
Make unwieldy venue piece filter last