discussion rework; query desc; fix results