fix search address for add incident
fix conflict