Fix for non-functional page after refactoring of service