Yet another performance improvement based on the previous.

Now that we have the crappy inferencer 2 we do not rely on crappy
inferencer 1 (man, this is confusing) anymore to query types.
Thus, we can use ResourceTypeTerm instead of ComparisionTerm for the
file/folder query. This allows the previous optimization to be used
for FileQuery, too.