Fix dynamic services catalog and entities