Selection and Parsing bug fixes