Fix params
Skip empty query results