move towards fic2 wp3 poi api