fix query!!