header, location tidy up and attached filters