adding mapping functions, changing search response structure