Fix possible shiny in null
Enable use of category filter with gadgets