Hopefully finish the query fix (aka fix a bug I just introduced)