Fix trying to run a through query where the main query has no results
Allow reports to override option default values