minor updates to Demo and UserQuery