removed per-field checks and added more powerful entity checks, subsite handler context now hopefully correct