Improves query generation (tries to)

Still temporary :-/