Copy itemId to text field for default queries
Add another hack to add a default name field for country type