fix various issues with the new admin select2 integration