Using a better selector and fixing key issue