Introduce query_field

Made some fixes as well