new model logic

shoved the 'office' filter into an if statement