make queries resources fully conform to common behavior