Add more Private mode handlings

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>