Added map for filtered data