Correcly adding data from current location for both desktop and mobile