Paper accepted to NAACL 2024: Towards Improved Multi-Source Attribution for Long-Form Answer Generation