refactoring "page" -> "entry"; added service choice