modified users query