Fix query used to retrieve websites to check
Improve design