rearrange and add filters
fix imports
dynamic filtering