enforce passed down object type from rest version lookup and other minor fixes