Better handling of execute on queryable
Merge pull request #495 from jarlef/MinimizeQueryExecution

Better handling of execute on queryable