Support 'or_where' statement

Now support the 'or_where' statement as without this it was going into the 'default' fallback (using alias).