fix issue with 'contains' js function and fix date filter