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

Incorporated review comments, also fixed the issue with 'home' number

https://jira.appcelerator.org/browse/TIMOB-14243