Complete dynamic map and fix google map issue