Fixed bug with mislabeled autogenerated queries.
Fixed bug with bug fix.