Use proper html markup for search form and update it for Barceloneta Theme