fix usr queries