20130511.01 - Fixing: #6 #8 #9 plus:
- removed query description
- moved query to end of page
- some string changes