pupe_query fix.