Rewrite get inputs and include result set