Changes 15/09/2013

1. Added space for null byte character.
2. Added missing query.
Revert "Changes 15/09/2013"

This reverts commit 1d581505c06595655f27902170ef7c713aa074c5.
Revert "Revert "Changes 15/09/2013""

This reverts commit c0a76945d3ffc41adab6bc9da39a610b95c54ead.
Revert "Revert "Revert "Changes 15/09/2013"""

This reverts commit 25b68e37adddb9e0d229554b3c709d09a79c04ef.