Fixed some bugs, changed getGeneralWQPData to getWQPData