Vmod further changes

Requested changes again, ensuring search results are better etc etc