Added Dinamic Querys, Bug Fixes