#107: temp workaround to avoid query execution using outdated queries