Working on making all layers filterable