cleanup integration functions
add tags term and fields