Fix path issue, tagpath issue and add enable condition