Fix to use BP_Usaer_Query for Bp 1.7+