Some minor updates: removing message filter on property