improve the location report to be more efficient