Added user id in some api queries