Changed the way data was being filtered