Fixed some regressions

- Fixes address query string not being generated correctly
- Fixed spacing issue with header items (due to trailing whitespace
removal)