Add filtering for site entities, faster filtering