Adjusting readByQuery to properly handle readMore