Fix queries in person.rb scopes