fixed legend, filter names and layer toggle