Added partial support for field selection in queries