database reorg, queries find matches based on subclasses also
- not fully working, waiting transactions need solution for this