Using a forEach inside a filter to organize data