Fix hypercube legalentity and improved filter behavior