* Properly handle arguments for nested queries