Fix CollectionQuery to not re-run a query that's already been run
Fix render_setup if no options are given