Bug: by-id should be first, not second