Modified formatting and search functions