Fix an issue with prefilled tags among other things...

Fixes #214