fix bugs in admin extension
Merge branch 'admin-extension'