WIP
Get adding / re-adding fields working.
Activate / Deactivate query addition link.