Rudimentary-yet-improved organizationType mapping