Ignore eagerloaded relations when building SQL search/filter query
Merged with master