Fixed download counter (i.e. wrong field has been defaulted) + fixed redirected download urls

Created by: sverzegnassi

Reverted to old code from Michael. Isolated the routine which handles download abortion.