cleanups; updated query/option;