Added filtering to application state
Merge branch 'Prototype' of github.com:KSHSK/WAVED into Prototype