Amended USA Freedom Act draws questions from civil liberties groups