Fix search-id test for 2.1