query menu fix