delete TODO in class Fluent
change condition in queries for end of the path