switch to a more dynamic way to pull results from model db. add missing source loc.