Tidy-up
Add searching on id and uniqid