fix user scopes to use includes not joins