Readd keep_tags possiblity - add test for this
add testcase for keeptags