Made sorthandler more airtight in selections