Moved more functions from DrawOnAMap object to MapSearch object ready to be reused in further projects