#22 - Desktop App related updates: add filters before return data to app
Merge branch '22_Task' into testing