Fitpl fixes and add filter-skymap
add filter-skymap