Fixes for bulk friend search