Tags controller and minor fixes