Bug fix: got rid of displayed template tags and other issues