Fixed last issue in BVPS. For more data options will need to switch to new yql api