Brought back type dropdown in derivequeries close #212