Finish map popup
Fix #29. Finish filters for map
Comment error