Added more query options