Remap Q to @q, add some search highlighting improvements