options query improvement