Map, Filter & some fixes