add some safe guards with linked children & shortcuts