Saved Map now works with custom location