Fixed problem with query interception.