replaced Search query layer with queryPackage