Fix use proper match_traits for service screens
Fix use proper match_traits for service screens

serverboards/serverboards,serverboards/serverboards,serverboards/serverboards,serverboards/serverboards,serverboards/serverboards