Fix current Answer query