Rebase fix
Fixes on friends finding query