Search for a variable form now breaks on first match