Attempt to reduce queries in admin, not successful yet, too late to code