Architecture reorganisation, corrections to consider situations where elements in admin IDE are absent (e.g. Pages)