More cleanup, change to big check on Dinosaur object for filtering