Revert "allow sorting no matter what the first indicator is called"

This reverts commit c48e6fd4aff586e72944c22d44fc9548d6025bf2.
updated and fixed full run tests