Allow models to include null tenant values in queries