fixed selection object to pass component not self
fixed to call current_value in place of text