[TASK] Fix incorrect base class
[TASK] Inject PageSelectService
[TASK] Code cleanup