We ran into this issue and caused huge problem for my firm and client. We had to develop a custom solution that is now working to combat the "based on location" glitch. If interested, I can provide details on the solution.