toPage id fix semi-completed (errors for return links present!)
toPage id fix completed (added fromBook)