Fix for existing friend query