fixes find stop pages with re-factor of services...