fix a filename
spec out return_terms from the query side
add a next_page method