Add undeployment options to Makefile
Add incremental filter feature