Feature/#24 cityid queries