fix date error
fix filtering codes