Made item type optional search criteria
Merge branch 'master' into gh-pages