Added validation / SQL list / count generation.
Added filtering and cleaned up validation.
More complex parameter creation / other updates