Do not duplicate query on segment addition