Optimize type filters

Requires !1304 (merged) and !1305 (merged), closes #699 (closed)

Note that while using type_id did give a performance boost when filtering by a single type, using type__in for folder=True or False did not bring any significant change, because Postgres just deduces that the subquery can be turned back into an inner join; it changes nothing to the query plan.