Issue #2221755 by grom358, ianthomas_uk: Remove uses of deprecated Element functions.
Issue #2224427 by Wim Leers, tim.plunkett: Filter order no longer respected.