Better handling of execute on queryable