removed debug notify
really sanitizing location concat