Added query var regenration unique