Followup r99892, actually use $options in query