filter optimization
other version optimization
fix double entry in version filter