Added name filter and made changes appropriate for context display