Bring Blorp's variable name up to standard

Also tweak his SQL a bit to give Postgres some optimization hints