Filters improvements and reuse. Partial implementation of mapping tables with entity classes.