Merged UI and StorageQuery.