CHANGE: Make sure that only VO compliant sites are returned

Goes with #1507