Issue #57 - performance of admin.php