AI-696 : 1. update map on admin level change 2. do not update map on search
Merge remote-tracking branch 'origin/production2' into production2