Remove 'No data' header
Performance fixes