add options, speed up queries