Better filtering and hiding of headers when no content in module