working on dynamically adding filters
restoring filters
some cleanup