Changed method name
Separated filter statements
Changed table names and fixed backref bug
Added calendar reference to portfolio
Fixed imports