Changing EntityFilters to properly iterate through Entities opposed to the memory wasteful method.