Added changes for MR port fix AEID selection