fixed search and formatting