More filtering and legend improvments