Small cleanup
Rewrite var length relationship properties correctly in the where clause