Added tenant and user filtering