Query Options Fix