Uniform table tracking in queries, simplified so much code
Typo in on()