better search and replace

* changed ,r to deal with whole words instead of partial words
* added ,q for doing what ,r do but inside a whole function