move to NH Linq to make tenant filtering work