Added non-category numbers test to the standard demo.
Improved efficiency of handling non-matching categories (again).