Thank you both for the suggestions, I had considered adding some more expressive querying at a later stage, will have to consider these.