Fix duplicate requests starred issue