Better filter window title; small changes