swap some commands. e.g. isearch-.. (regexp or not), query-.. (regexp or not).