Fixes to links and forward URLs in filestorage