Minor fixes

Text corrections after restructuring and added sani numbers as part of
the search function.