Added where-raw as a model option and fixed an issue causing it to not work in certain circumstances.