FilterWindowViewModel First Implementation

Small cleanups