Some cosmetics to open-query.