Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev