Added date filter, character encoding protection