This might cause a problem.  Queries that work can return either a 200 or a 304.  Probably need to fix that before we can merge this.