working on Adherence bug - reverting to old query