Added consistent query and limit