Updates to searching and archive checks