Re-do the types a bit
allow data to go both ways
We already have NoLimit, no need for Maybe
fix up Gelbooru
fix up Safebooru
Merge branch 'api'