Fixes on where extension and webmodel