Fix issue with multiword queries
Improve codestyle in HTML