Search and fix for who
Signed-off-by: Antes <malinbay@gmail.com>