Fix approach for getting file name from share key
Fix key name matching to be more accurate on delete