Oooops...

Signed-off-by: emanuele <emanuele45@gmail.com>
A bit of rework on the class and relative code, fixed the queries, that as reported by Suki were a "bit" broken :P, removed the instantiation of the class in the template

Signed-off-by: emanuele <emanuele45@gmail.com>