#399 fix admin side bugs