updated schema and views, and removed the "empty tag" bug