The images for Kono Bijutsubu ni wa Mondai ga Aru! and Kono Subarashii Sekai ni Shukufuku wo! in Best Comedy should probably be replaced; it's bit closer to horror, especially the Bijutsubu one.
How about these?
http://www.anime-evo.net/wp-content/...osuba_09_4.jpg
https://lh3.googleusercontent.com/-6...82447%2529.png
Not sure about Tanaka-kun wa Itsumo Kedaruge since didn't watch it.
Everything else looks good, especially Keijo in sports and Shelter in OVA.