I updated the es_patch.diff file above and also the folder generation script to take in to account the expanded folder tags that are available, I also made the script easier to expand with more tags for future expansion