last touches for public Query API 

 - https://issues.jboss.org/browse/ISPN-3580
 - https://issues.jboss.org/browse/ISPN-3581