UN assembly takes up global counter-terrorism plan