Fixed wonky assignment for default query