Performance Enhancements to klass.sourced queries.