Ah yes! This looks good, and honestly we could merge, I simply wanted to verify that query with some testing, but haven’t had time and I’d honestly say we could merge, but we are trying hard to hold off on merging until stable is tagged (although we aren’t mega strict ;))