Merge branch 'master' into stable

app/controllers/v1/feed_controller.rb

@@ -48,7 +48,11 @@ class V1::FeedController < ApplicationController
       end
     end
 
-    values[0] = query[0..-3]+")" # remove trailing "or" on the query
+    if query[-1] == "("
+      query = query[0..-6]
+    else
+      values[0] = query[0..-3]+")" # remove trailing "or" on the query
+    end
     return PublicActivity::Activity.where(key: activities_filter).where(values).order(created_at: :desc)
   end