Improved search: check for class titles AFTER everything else.
Merge pull request #576 from uakfdotb/searchimprovement

Improved search: check for class titles AFTER everything else.