Correct text values & try and correct selection issue