Fixing few compilation issues and missign query string
configuration
Authored by: artyom-beilis 2011-01-18
Parent: [r1637]
Child: [r1639]
