Fixed a bypass spotted by @irsdl
Added CONTENT_TAGS array
Fixed problems with KEEP_CONTENT
Fixed the tests