Re-enabled pluggable searches. Removed test Regex replacement (no real benefit).