fixed issue with selection with empty values