Fix identifiers for search and browse