fixed search, added draft capability