Fix datawatcher filter for 1.5.2