filedownload fix and service extraction