fixed some stuff related to use of short_label instead of protocol in admin controllers and views