Final fixes based on conversation with kpy@
Final fixes based on conversation with kpy@

hugoloza/googlepersonfinder,Kushal0707/googlepersonfinder,Gentlemanlylad5/googlepersonfinder,Gentlemanlylad5/googlepersonfinder,harshvardhanmalpani/googlepersonfinder,harshvardhanmalpani/googlepersonfinder,Kushal0707/googlepersonfinder,hugoloza/googlepersonfinder