Update logic for adding SelectByIdLoadHandler
CORE-5183