Maid 472 expected and ui fixes