TIMOB-14243-incorporated review comments, also fixed the issue with 'home' number
Merge pull request #5923 from salachi/TIMOB-14243

TIMOB-14243-incorporated review comments, also fixed the issue with 'hom...