remove the keyword module :)

and change the collect module to handle tags correctly