Better fix for widget queries