#873228 Query broken by Views bug, this will get rid of error messages once #799604 is in. Still more work to do but this was a big one.
