headers in filtered library activity and some other types of cleanup