Improve the fingerprint switcher

Support