fixed query issues + mvn build parametrized