Fixed caching bugs
Re-enabled before filter for admins