3632 Check challenge type instead of id for non-challenges