Optimize to perform a single gerrit query
Also fix a bug with filters on owner