Works in Redirect & Toast

[saileshpant12]

@nischalcts still needed to be completed in some modules we will be working on it continuously