Fixed bug with singletone navigations and added node_id to custom content navigations