added uId to filtering