Small optimization for options form number of queries