Settings added, window position and state preserved, query limit still not enforced