Fix scores query to also filter by klass