Resolved 'trying to get value of undefined variable' issues.
- Resolved many 'trying to get value of undefined variable' issues.
- Renamed the two files that seed the search form shortcodes.