fix bug 858958 - Remove datetimeformat filter and fix nits