Fix handling of setup file wrt setting tags