Some change in Query Result and retrivers