Bug/1.5.x/pe 2675 change filter order for distinct resource events