Map identifiers to field "id" in search_request
Bunch of unrelated changes