Refactor ApplicationSearch, removed factory implementation.