Untested version of options query complete