It would be helpful if you could search by Element Category or Element Description when searching for Analyses in PSE. My setup is 5 templates (CHW, Water, HW, Electric, Steam), each of which have accounts that can come from 5 different sources (selectable by element category). I can't filter by both commodity type AND source, I can only do Commodity type using the "Template" criteria option, as the "Category" and "Description" search criteria options relate to Analyses, not to elements. This severely limits the functionality of the search feature for me.