password recovery email fixes, added cid to search results