1 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 1097b32dd..c0a58c3f0 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1748,6 +1748,9 @@ sub _do_operator_function {
     my ($self, $func_args) = @_;
     my $operator = $func_args->{operator};
     my $operator_func = OPERATORS->{$operator};
+    my $operator_func = OPERATORS->{$$operator}
+      || ThrowCodeError("search_field_operator_unsupported",
+                        { operator => $$operator });
     $self->$operator_func($func_args);
 }
 
@@ -2827,7 +2830,8 @@ sub _changedby {
 sub IsValidQueryType
 {
     my ($queryType) = @_;
-    if (grep { $_ eq $queryType } qw(specific advanced)) {
+    # BMO: Added google and instant
+    if (grep { $_ eq $queryType } qw(specific advanced google instant)) {
         return 1;
     }
     return 0;