Update composer, finish map markers, search and other popup functionality