Some fixes: liveQuery and comment.