- Added page titles
- Fixed data query