Add Cat/Fielddata endpoint
[TEST] Fix incorrect feature-skip behavior