refactoring - still fixing drilldownnavcmdfinder