No more ORG files EVER
Move filter into an file for includes and get the main and subcategory
lists showing the right stuff and having the right values selected