query and ui adaptions for new index2