Added proper support for manual runs to return clientAgent = manual and set conditionals around that premise