fixed spec
Better search, deal with non admin users
Use published version of masq