fix remap of q, wq and x