Expand flexibility of arguments for .query