Fixes on new where sql string generate extension class