Updated to append the data source to the fields so that they won't validate incorrectly and fixed the submit for advanced search params - This is for spending domain, previous checkin was with contracts