Change selectComponent public method to handle end-of-content scenario