Fixes on standard search form