fixed formatting and filtering errors