Add options to query