small adjustment
small refactor
scalar select for relation