a little clean up, and add Tags collection to link submit select