Fixed reference
Added advanced search
Merge remote-tracking branch 'upstream/master'