fix regression in webadmin

and other cleaning