Improved taxa query.