Self.search additions and movie script clean up