Updates to implement changes from 1.1 and a fix to search mechanism