SL: Optimize geo location and did some refactor work of incidents reports