Finalise the include/exclude fields functions