fixed: data parsing, data selector