More checking against categories

We can now search all categories for a partial match - this tidies up
validation based on age. This update also standardised variable names