24285, add filters to drill down & fix metadata issues