Starting to come along nicely. Might be able to finish this today now that the search is applying to them and things are filtering correctly in the test types. As long as there are no surprises along the way... Just a question of adjusting these filters for each type (joining the relevant table) and writing the save logic.
Only potential issues I see are with multi-select types (translations, categories). Crossing my fingers those also go smoothly.