Updated views (added search handler)