The Market Screener Plus is indeed a great tool and I use it daily.
One addition that will improve it is if you add the Issue Type Code in the Fundamentals in a similar way as you already have for Industry etc.
This way if one is interested let’s say in ETF with code % there is no need to flood the selections with Stocks with code 0 and will be able to add more criteria before the 1000 limit is reached.
That’s my 2 cents.