Removed Comp-Status from search as it's filtered out anyway later