Fix ID-based selections in FindData dialog.

Bringing back support for making id-based queries in the Find Data
dialog.

Change-Id: I7aa8e286fb7fad36bce98eb76521cde80a7c9abe
Merge topic 'fix_id_selections_in_find_data' into next

bbbdfb32 Fix ID-based selections in FindData dialog.