made some tweaks to enable querying score data efficiently