fixed missing applicationid refactoring