fix checking key in wrong fashion
fix missing namespace