Added 'Web page' string to 'page' search term.
Add 'Software' to facet string. Fix tab in software.json.