Not removing votes for target content when the entity is deleted/removed

My setup:
Review content type with :
1) Entity reference field
2) fivestar field with target the reference field the votes are casted towards the reference and not the current review (as supported by the fivestar module)

all that is great but as the reviews need approval and might be deleted later on the votes are not calculated correctly later on because :
1) votingapi is set so that one use can cast multiple votes on same content and each vote will be considered a new one as one user can write different reviews and some of them might be accepted and some not

In order to simulate all you need to do is setup the votingapi as described above , then create a review and then delete the review. You can see that the votes are not deleted. The reason is :
1) in function _fivestar_cast_vote you are calling votingapi_select_votes and expect that the voting will handle it but it is not possible. Also when votingapi check what criteria it should add it always adds " REQUEST_TIME - timeset" , so even if you say that the votes casted from the user for this entity for 1hour will be treated as one vote , that still will fail because you can delete/disable the review after 1 day.
2) when you are inserting the votes you are using the same criteria and again expect the votingapi to handle it which as described above is not possible

so what i did was :
1) change in function _fivestar_field_helper and add soruce option so later on when a field is deleted/updates it knows exactly which votes it should delete or update
also remove the recalculation of the results cause the _fivestar_cast_vote does that so no need to repeat it
2) add the vote_source to the _fivestar_cast_vote as argument and made a few changes cuase the deletion should be done only when we have 0 value and no need to even try to select user votes when we are not going to delete them

so here is how the 2 function look now :
1) in fivestar.field.inc file :

function _fivestar_field_helper($entity_type, $entity, $field, $instance, $langcode, &$items, $op = '') {
  list ($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
  foreach ($items as $delta => $item) {
    if ((isset($entity->status) && !$entity->status) || $op == 'delete') {
      $rating = 0;
    }
    else {
      $rating = (isset($items[$delta]['rating'])) ? $items[$delta]['rating'] : 0;
    }
    $target = _fivestar_field_target($entity, $field, $instance, $item, $langcode);
    if (!empty($target)) {
      $sources = array(
        $entity_type,
        $bundle,
        $vid,
        $langcode,
        $delta,
      );
      $vote_source = implode(':', $sources);
      _fivestar_cast_vote($target['entity_type'], $target['entity_id'], $rating, $field['settings']['axis'], $entity->uid, TRUE, $vote_source);
    }
  }
}

2) in fivestar.module :

function _fivestar_cast_vote($entity_type, $id, $value, $tag = NULL, $uid = NULL, $skip_validation = FALSE, $vote_source = '') {
  global $user;
  $tag = empty($tag) ? 'vote' : $tag;
  $uid = isset($uid) ? $uid : $user->uid;
  // Bail out if the user's trying to vote on an invalid object.
  if (!$skip_validation && !fivestar_validate_target($entity_type, $id, $tag, $uid)) {
    return array();
  }
  // Sanity-check the incoming values.
  if (is_numeric($id) && is_numeric($value)) {
    if ($value > 100) {
      $value = 100;
    }

    // Get the user's current vote.
    $criteria = array('entity_type' => $entity_type, 'entity_id' => $id, 'tag' => $tag, 'uid' => $uid);
    // Add vote_source for cck fields.
    if (!empty($vote_source)) {
      $criteria['vote_source'] = $vote_source;
    }

    if ($value == 0) {
      // Select the votes we need to remove.
      $user_criteria = array();
      if (!$uid && empty($vote_source)) {
        // Get the unique identifier for the user (IP Address if anonymous).
        $user_criteria = votingapi_current_user_identifier();
      }
      $user_votes_criteria = $criteria + $user_criteria;
      $function = variable_get('votingapi_storage_module', 'votingapi') . '_votingapi_storage_select_votes';
      $user_votes = $function($user_votes_criteria, 0);
      votingapi_delete_votes($user_votes);
    }
    else {
      $votes = $criteria += array('value' => $value);
      votingapi_set_votes($votes);
    }

    // Moving the calculationg after saving/deleting the vote but before getting the votes.
    votingapi_recalculate_results($entity_type, $id);    
    return fivestar_get_votes($entity_type, $id, $tag, $uid);
  }
}

If you think I have done something wrong please write.

Kind Regards,
Dobromir