bug fix query, popup