login fix and filtering