Added a bunch of properties to the flikr API search
Tidied up the code a bit