improved admin slowdown issues