reworked identification on separate page to avoid reload issues