Optimize super_entity checking. Test for query nums.
More query number optimization and tests.
Method docstrings.