Add index and date based queries.