Single query fix