Input params fixes for Query