Adbanced search implemented
Merge branch 'Thomas'