Search fixes by client requests