FIX: Automatic refactoring bugs in RecordSelector