fixed data loading and filtering