[aphrodite] Improve API queries