fixed formatting and search