Query / Path traits return + some logical improvements