Single image query fix