Task done : Changed parameters of window for Legacy Queries (Issue #29)