Improved etags and header generation