adds search form override and fixes a flow issue