update for current hackfest 2014 ;-)

some changes in query and suggest syntax since years ago :-)

code is still a mess_