query temporary fix