Search form now uses refactored role/record types