[Admin] Fix admin & entities