[#84363702] - not all doctors are present in "provider" dropdown
and
refactorings, improving code and obsolete code removal