Fix page issue
Add fliter
Update tcal date format