Given the above change, move the if (manifest) || '' to here