query options cleanup