(/=) Fix renaming, nested queries