Added user id filter