Support statement search and improve display