Added limiting queries, need to add tests [Finishes #80855358]