Ticket/12426 Rework of user search