filter/criteria/relation fix