Fix bug with UserQuery binding
Added support to filter by site